From 3e5d604ad38573a755d5c2fdf1d9593dc6a76d1d Mon Sep 17 00:00:00 2001
From: tsteven4 <tsteven4@gmail.com>
Date: Tue, 15 May 2018 20:13:07 -0600
Subject: [PATCH] fix travis builds

---
 .travis.yml    | 4 ++--
 build_and_test | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4704d9ceb..2a9029ab6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,7 @@ install:
 
 script:
   - if [ "${USE_DOCKER}" = "true" ]; then ./docker_hook; fi
-  - if [ "${USE_DOCKER}" = "false" ]; then  LDFLAGS=-Wl,-rpath,/opt/qt${QT_VERSION}/lib ./build_and_test; fi
-  - ./gpsbabel -D 1
+  - if [ "${USE_DOCKER}" = "false" ]; then LDFLAGS=-Wl,-rpath,/opt/qt${QT_VERSION}/lib ./build_and_test; fi
+  - unset QTDIR; unset LD_LIBRARY_PATH; unset PKG_CONFIG_PATH; # partially undo qt${QT_VERSION}-env.sh for linuxdeployqt based on https://github.com/probonopd/linuxdeployqt
   - if [ "${USE_DOCKER}" = "false" ]; then export VERSION=$(git rev-parse --short HEAD); fi # linuxdeployqt uses this for naming the file
   - if [ "${USE_DOCKER}" = "false" ]; then cd gui; QMAKE=/opt/qt${QT_VERSION}/bin/qmake LINUXDEPLOYQT=../linuxdeployqt ./makeappimage.sh; fi
diff --git a/build_and_test b/build_and_test
index 6e654bedc..7e5b5e627 100755
--- a/build_and_test
+++ b/build_and_test
@@ -27,6 +27,7 @@ mkdir -p $GBTEMP
 make toolinfo
 make clean
 make
+./gpsbabel -D 1 || true
 make linux-gui
 make doc
 make gpsbabel.html
-- 
2.30.2